From 957135a57c9c7eb5c3b334a7528f91f96fd1b820 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 2 Nov 2015 12:21:39 -0500
Subject: [PATCH] Adwaita: Fix menu separators

These were inadvertedly broken by the element name conversion
for regular separators.
---
 gtk/theme/Adwaita/_common.scss           | 3 ++-
 gtk/theme/Adwaita/gtk-contained-dark.css | 7 +++++--
 gtk/theme/Adwaita/gtk-contained.css      | 7 +++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 07cf27eb5e..5128551999 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -954,7 +954,7 @@ GtkComboBox {
     color: $backdrop_insensitive_color;
   }
   .menuitem { text-shadow: none; }
-  & separator.vertical {
+  &.separator.vertical {
     // always disable separators
     -GtkWidget-wide-separators: true;
   }
@@ -2512,6 +2512,7 @@ GtkScrolledWindow {
 }
 
 //vbox and hbox separators
+.menuitem.separator,
 separator {
   // always disable separators
   // -GtkWidget-wide-separators: true;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index b112a08d9c..0ea7a2b22c 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1467,7 +1467,7 @@ GtkComboBox {
     color: #5d6767; }
   GtkComboBox .menuitem {
     text-shadow: none; }
-  GtkComboBox separator.vertical {
+  GtkComboBox.separator.vertical {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry entry:dir(ltr), GtkComboBox.combobox-entry spinbutton:dir(ltr) {
     border-top-right-radius: 0;
@@ -3498,9 +3498,12 @@ frame,
 GtkScrolledWindow viewport.frame {
   border-style: none; }
 
+.menuitem.separator,
 separator {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton separator.vertical, button.font separator.vertical {
+  GtkFileChooserButton .menuitem.separator.vertical, button.font .menuitem.separator.vertical, GtkFileChooserButton
+  separator.vertical, button.font
+  separator.vertical {
     -GtkWidget-wide-separators: true; }
 
 /*********
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 26a8e65008..25f373327c 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1467,7 +1467,7 @@ GtkComboBox {
     color: #c7c7c7; }
   GtkComboBox .menuitem {
     text-shadow: none; }
-  GtkComboBox separator.vertical {
+  GtkComboBox.separator.vertical {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry entry:dir(ltr), GtkComboBox.combobox-entry spinbutton:dir(ltr) {
     border-top-right-radius: 0;
@@ -3660,9 +3660,12 @@ frame,
 GtkScrolledWindow viewport.frame {
   border-style: none; }
 
+.menuitem.separator,
 separator {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton separator.vertical, button.font separator.vertical {
+  GtkFileChooserButton .menuitem.separator.vertical, button.font .menuitem.separator.vertical, GtkFileChooserButton
+  separator.vertical, button.font
+  separator.vertical {
     -GtkWidget-wide-separators: true; }
 
 /*********
-- 
2.30.2